Fix a C99ism

diff --git a/ChangeLog b/ChangeLog
index 30114695a45d57b7ce525e17afcada03c3998d9e..d146b82306a3b9111670f82022b8e4513a955916 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)
+
 2006-01-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c: Add some notify batching, always

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30114695a45d57b7ce525e17afcada03c3998d9e..d146b82306a3b9111670f82022b8e4513a955916 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2006-01-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)
+
 2006-01-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c: Add some notify batching, always

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index e0557422ff05a9c8f67fac16286b8a1e76ea675d..28cc24e8101ce5c123167dda1838d32768638876 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1794,11 +1794,12 @@ get_label_wrap_width (GtkLabel *label)
   PangoLayout *layout;
   GtkStyle *style = GTK_WIDGET (label)->style;
   static GQuark quark_label_wrap_width = 0;
+  LabelWrapWidth *wrap_width;
 
   if (quark_label_wrap_width == 0)
     quark_label_wrap_width = g_quark_from_static_string ("gtk-label-wrap-width");
 
-  LabelWrapWidth *wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width);
+  wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width);
   if (!wrap_width)
     {
       wrap_width = g_slice_new0 (LabelWrapWidth);